I would definitely prefer if you cherry pick the commits so that you have one per annotation and not to lose the author of the commits. @wimdeblauwe or do you have a different opinion on this?

@xhaggi
Well then I need to solve merge conflicts for each step, it already took two hours as it is now.

I would definitely prefer if you cherry pick the commits so that you have one per annotation and not to lose the author of the commits. @wimdeblauwe or do you have a different opinion on this?

I like small commits for sure, but I think this is a nice whole. I don't see much need for separate commits for each annotation. That said, maybe @tschuehly can do a force commit with an added line in the commit message using Co-authored-by (https://docs.github.com/en/pull-requests/committing-changes-to-your-project/creating-and-editing-commits/creating-a-commit-with-multiple-authors) to acknowledge all the work you have done on it.

Well then I need to solve merge conflicts for each step, it already took two hours as it is now.

@tschuehly I really appreciate your work, but I like to stick to separate commits and the original work I did. That's why I did it on my own and created a separate PR #118 for it. I hope this is OK for you? Maybe you should have asked in #105 if I could do the rebase and a PR, I certainly would have done it. BTW it only took me a few minutes.

Well now it doesn't matter 😁